-
Notifications
You must be signed in to change notification settings - Fork 1.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Dockers]: Manage all Docker containers with Supervisord #573
Conversation
- Also now installing supervisor package in docker-base so that supervisor is available in all docker containers and can be used as a standard, so removed supervisor installation from dockers built on top of docker-base. - Capped supervisor log max filesize to 1MB and max of 2 rotated files. We shouldn't need more because rsyslog should be constantly monitoring changes to these files and appending them to syslog. - Also some unrelated minor cleanup in docker-ptf Dockerfile
…iserver-mlnx; update .gitignore
|
||
trap clean_up SIGTERM SIGKILL | ||
|
||
service syncd start |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
syncd still managed by service not supervisord?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
syncd has a complex init script. I don't have much experience with syncd operations and testing methods, so I figured this task would be best left to someone with more experience. Init script functionality just needs to be ported into the syncd.sh script I created.
* Allow decap tunnel configuration without "src_ip" Signed-off-by: Stepan Blyschak <stepanb@mellanox.com> * Remove overlay loopback interface when removing tunnel After tunnel removal there was still overlay loopback interface in ASIC DB. Signed-off-by: Stepan Blyschak <stepanb@mellanox.com> * Add more test cases to test_tunnel.py Seperate symmetric and decap tunnel test Add checks for tunnel removal Signed-off-by: Stepan Blyschak <stepanb@mellanox.com>
The following changes are included in this submodule advance 54b2510 [syncd] Use correct VID when GET will fail to obrain object type (#577) 59b0430 [syncd] Unlock vendor api lock if enabling diag shell (#571) 910d45e [vs] Add more logs when setting MTU on port (#576) c0d9947 [vs] Fix setting correct port mtu value (#573)
* f4d9398 2020-04-07 | [vs] Set mto only on tap device (#592) [Kamil Cudnik] * 0ad13f5 2020-04-07 | [lgtm]: add lgtm static analysis configuration (#589) [lguohan] * c961260 2020-04-07 | add swss-common-{inc,lib} to specify the prefix of swss-common library (#590) [lguohan] * 2d68abc 2020-04-06 | [syncd] Load correct global context id (#588) [Kamil Cudnik] * cd82389 2020-04-06 | Return correct error code when port is in use (#565) [Vasant Patil] * 2189c2f 2020-04-02 | [syncd] Pass correct switch RID when staring diag shell (#587) [Kamil Cudnik] * 91792db 2020-04-01 | [syncd] Fix crash during stats polling (#586) [Vitaliy Senchyshyn] * d13521e 2020-04-01 | [meta] Flush fdb entries after flush api success (#581) [Kamil Cudnik] * 54b2510 2020-03-17 | [syncd] Use correct VID when GET will fail to obrain object type (#577) [Kamil Cudnik] * 59b0430 2020-03-16 | [syncd] Unlock vendor api lock if enabling diag shell (#571) [Kamil Cudnik] * 910d45e 2020-03-16 | [vs] Add more logs when setting MTU on port (#576) [Kamil Cudnik] * c0d9947 2020-03-13 | [vs] Fix setting correct port mtu value (#573) [Kamil Cudnik]
d00a25bb [ci] refer 202106 branch resources rather than master branch. (sonic-net#573) Signed-off-by: Stephen Sun <stephens@nvidia.com>
d00a25bb [ci] refer 202106 branch resources rather than master branch. (#573) Signed-off-by: Stephen Sun <stephens@nvidia.com>
This PR serves a number of purposes:
ENTRYPOINT
supervisorctl start
, which will block until it completes. Each supervisor.conf file is configured to autostart only start.sh. All processes started using supervisorctl in start.sh are added to supervisor.conf but set to not autostart. This allows them to be started by start.sh yet be monitored by supervisord (the process must be started using supervisorctl in start.sh to be monitored).These changes were made to all dockers currently in use except docker-fpm-frr as I have no device to test on (will create an issue once this PR is merged). Other dockers not updated are deprecated and should be removed in the near future (see issue #572)